auto merge of #1089 : bheart/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 25 Dec 2014 04:28:40 +0000 (04:28 +0000)
committerbors <bors@rust-lang.org>
Thu, 25 Dec 2014 04:28:40 +0000 (04:28 +0000)
Builds break on recent versions of rustc.

This is in response to rust-lang/rust@16f01cc - the change was addressed
in rust-lang/rustc-serialize@1561cca, versioned 0.1.5.

Update dependency accordingly.


Trivial merge